Merge tag 'upstream/2.0.2'
authorPeter Colberg <peter@colberg.org>
Sun, 31 Jul 2016 03:20:28 +0000 (23:20 -0400)
committerPeter Colberg <peter@colberg.org>
Sun, 31 Jul 2016 03:20:28 +0000 (23:20 -0400)
commitf26496d5f52104e70df0641d7a6ad54a9755d0a2
treee576736d16c44a93bfb42e40e025a00018e22ffb
parent1ae29f484a8857299e227b44ee65cdc127987ab5
parent497deb7a7ea614e02a6b1ed28e120f87235b9218
Merge tag 'upstream/2.0.2'

Upstream version 2.0.2